This patch adds a check to make sure the config file passed to

vnet-create is correct.  This is better than throwing IOError, because
IOError's are currently reported as xend communication failures.
Also, fix the IOError handling at the end of the file so we don't get
a stack dump if that path is taken.

Signed-off-by: Dan Smith <danms@us.ibm.com>

diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index cec2bef59db48bb5a6b2df222db319a719903e73..ec4bf16d3a99e19e0b4877ca72751d4225cbd3f3 100644 (file)
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -666,6 +666,10 @@ def xm_vnet_list(args):
 def xm_vnet_create(args):
     arg_check(args, 1, "vnet-create")
     conf = args[0]
+    if not os.access(conf, os.R_OK):
+        print "File not found: %s" % conf
+        sys.exit(1)
+
     from xen.xend.XendClient import server
     server.xend_vnet_create(conf)
 
@@ -800,7 +804,7 @@ def main(argv=sys.argv):
         except KeyboardInterrupt:
             print "Interrupted."
             sys.exit(1)
-        except IOError:
+        except IOError, ex:
             if os.geteuid() != 0:
                 err("Most commands need root access.  Please try again as root.")
             else: